From 51bfa10eed5dee6a44d24f35506522600deab804 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 21 Oct 2014 13:51:22 +0200
Subject: [PATCH] Adwaita: properly fix places sidebar

Forgot to treat treeview background... Some code refactoring in
the process.
---
 gtk/resources/theme/Adwaita/_colors.scss      |  3 +++
 gtk/resources/theme/Adwaita/_common.scss      | 24 +++++++++++++++----
 .../theme/Adwaita/gtk-contained-dark.css      |  9 +++++--
 gtk/resources/theme/Adwaita/gtk-contained.css |  9 +++++--
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index a612caedb5..200969a115 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -26,6 +26,8 @@ $osd_bg_color: #2e3436;
 $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
+$sidebar_bg_color: lighten($bg_color,5%);
+
 $tooltip_borders_color: $osd_outer_borders_color;
 
 //insensitive state derived colors
@@ -41,3 +43,4 @@ $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
+$backdrop_sidebar_bg_color: lighten($backdrop_bg_color,5%);
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index f387f917b6..e7905b5d21 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2702,8 +2702,8 @@ GtkFileChooserDialog {
 
 .sidebar {
   border: none;
-  $_sidebar_bg: lighten($bg_color,5%);
-  background-color: $_sidebar_bg;
+  background-color: $sidebar_bg_color;
+
   .scrollbar {
     &.trough {
       background-color: darken($bg_color,10%);
@@ -2711,14 +2711,17 @@ GtkFileChooserDialog {
       border-width: 2px;
       border-color: transparent;
     }
+
     &.slider {
-      background-color: $_sidebar_bg;
+      background-color: $sidebar_bg_color;
       &:hover { background-color: lighten($bg_color, 10%); }
     }
   }
+
   &:backdrop {
-    background-color: lighten($backdrop_bg_color,5%);
+    background-color: $backdrop_sidebar_bg_color;
   }
+
   &:selected {
     background-color: $selected_bg_color;
   }
@@ -2726,16 +2729,24 @@ GtkFileChooserDialog {
 
 // Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
 GtkPlacesSidebar.sidebar .view {
+
   color: $fg_color;
+  background-color: transparent;
+
   &:backdrop { color: $backdrop_fg_color; }
+
   &:selected {
     color: $selected_fg_color;
+    background-color: $selected_bg_color;
+
     &:backdrop { color: if($variant == 'light', $backdrop_base_color, $selected_bg_color); }
   }
+
   .separator,
   .separator:backdrop { @extend .separator; }
 }
 
+
 .sidebar-item {
   padding: 10px 4px;
   > .label {
@@ -2748,6 +2759,11 @@ GtkPlacesSidebar.sidebar .view {
   }
 }
 
+
+/*********
+ * Paned *
+ *********/
+
 GtkPaned { // this is for the standard paned separator
 
   -GtkPaned-handle-size: 1; // sets separator width
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 191cb65cb7..47dd882849 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -4052,11 +4052,13 @@ GtkFileChooserDialog .dialog-action-box {
     background-color: #215d9c; }
 
 GtkPlacesSidebar.sidebar .view {
-  color: #eeeeec; }
+  color: #eeeeec;
+  background-color: transparent; }
   GtkPlacesSidebar.sidebar .view:backdrop {
     color: #939695; }
   GtkPlacesSidebar.sidebar .view:selected {
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #215d9c; }
     GtkPlacesSidebar.sidebar .view:selected:backdrop {
       color: #215d9c; }
 
@@ -4068,6 +4070,9 @@ GtkPlacesSidebar.sidebar .view {
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/*********
+ * Paned *
+ *********/
 GtkPaned {
   -GtkPaned-handle-size: 1;
   margin: 0 8px 8px 0; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index fa6e203fa3..0d4c33e9ce 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -4213,11 +4213,13 @@ GtkFileChooserDialog .dialog-action-box {
     background-color: #4a90d9; }
 
 GtkPlacesSidebar.sidebar .view {
-  color: #2e3436; }
+  color: #2e3436;
+  background-color: transparent; }
   GtkPlacesSidebar.sidebar .view:backdrop {
     color: #8d9091; }
   GtkPlacesSidebar.sidebar .view:selected {
-    color: #ffffff; }
+    color: #ffffff;
+    background-color: #4a90d9; }
     GtkPlacesSidebar.sidebar .view:selected:backdrop {
       color: white; }
 
@@ -4229,6 +4231,9 @@ GtkPlacesSidebar.sidebar .view {
   .sidebar-item.needs-attention > .label {
     background-size: 6px 6px, 0 0; }
 
+/*********
+ * Paned *
+ *********/
 GtkPaned {
   -GtkPaned-handle-size: 1;
   margin: 0 8px 8px 0; }
-- 
2.30.2